Autogenerated HTML docs for v2.2.0-rc0
diff --git a/git-mergetool.html b/git-mergetool.html index b88de16..4eba3be 100644 --- a/git-mergetool.html +++ b/git-mergetool.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.6.6" /> +<meta name="generator" content="AsciiDoc 8.6.9" /> <title>git-mergetool(1)</title> <style type="text/css"> /* Shared CSS for AsciiDoc xhtml11 and html5 backends */ @@ -87,10 +87,16 @@ ul > li { color: #aaa; } ul > li > * { color: black; } -pre { +.monospaced, code, pre { + font-family: "Courier New", Courier, monospace; + font-size: inherit; + color: navy; padding: 0; margin: 0; } +pre { + white-space: pre-wrap; +} #author { color: #527bbd; @@ -219,7 +225,7 @@ } div.imageblock div.content { padding-left: 0; } -span.image img { border-style: none; } +span.image img { border-style: none; vertical-align: text-bottom; } a.image:visited { color: white; } dl { @@ -349,7 +355,7 @@ margin-bottom: 0.1em; } -div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { +div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { margin-top: 0; margin-bottom: 0; } @@ -407,18 +413,14 @@ span.overline { text-decoration: overline; } span.line-through { text-decoration: line-through; } +div.unbreakable { page-break-inside: avoid; } + /* * xhtml11 specific * * */ -tt { - font-family: monospace; - font-size: inherit; - color: navy; -} - div.tableblock { margin-top: 1.0em; margin-bottom: 1.5em; @@ -452,12 +454,6 @@ * * */ -.monospaced { - font-family: monospace; - font-size: inherit; - color: navy; -} - table.tableblock { margin-top: 1.0em; margin-bottom: 1.5em; @@ -537,6 +533,8 @@ @media print { body.manpage div#toc { display: none; } } + + </style> <script type="text/javascript"> /*<+'])'); + var re = new RegExp('[hH]([1-'+(toclevels+1)+'])'); // Function that scans the DOM tree for header elements (the DOM2 // nodeIterator API would be a better technique but not supported by all // browsers). @@ -610,7 +608,7 @@ var i; for (i = 0; i < toc.childNodes.length; i++) { var entry = toc.childNodes[i]; - if (entry.nodeName == 'div' + if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") && entry.getAttribute("class").match(/^toclevel/)) tocEntriesToRemove.push(entry); @@ -656,7 +654,7 @@ var entriesToRemove = []; for (i = 0; i < noteholder.childNodes.length; i++) { var entry = noteholder.childNodes[i]; - if (entry.nodeName == 'div' && entry.getAttribute("class") == "footnote") + if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote") entriesToRemove.push(entry); } for (i = 0; i < entriesToRemove.length; i++) { @@ -758,7 +756,7 @@ <div class="sect1"> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="paragraph"><p>Use <tt>git mergetool</tt> to run one of several merge utilities to resolve +<div class="paragraph"><p>Use <code>git mergetool</code> to run one of several merge utilities to resolve merge conflicts. It is typically run after <em>git merge</em>.</p></div> <div class="paragraph"><p>If one or more <file> parameters are given, the merge tool program will be run to resolve differences on each file (skipping those without @@ -781,35 +779,35 @@ <p> Use the merge resolution program specified by <tool>. Valid values include emerge, gvimdiff, kdiff3, - meld, vimdiff, and tortoisemerge. Run <tt>git mergetool --tool-help</tt> + meld, vimdiff, and tortoisemerge. Run <code>git mergetool --tool-help</code> for the list of valid <tool> settings. </p> <div class="paragraph"><p>If a merge resolution program is not specified, <em>git mergetool</em> -will use the configuration variable <tt>merge.tool</tt>. If the -configuration variable <tt>merge.tool</tt> is not set, <em>git mergetool</em> +will use the configuration variable <code>merge.tool</code>. If the +configuration variable <code>merge.tool</code> is not set, <em>git mergetool</em> will pick a suitable default.</p></div> <div class="paragraph"><p>You can explicitly provide a full path to the tool by setting the -configuration variable <tt>mergetool.<tool>.path</tt>. For example, you +configuration variable <code>mergetool.<tool>.path</code>. For example, you can configure the absolute path to kdiff3 by setting -<tt>mergetool.kdiff3.path</tt>. Otherwise, <em>git mergetool</em> assumes the +<code>mergetool.kdiff3.path</code>. Otherwise, <em>git mergetool</em> assumes the tool is available in PATH.</p></div> <div class="paragraph"><p>Instead of running one of the known merge tool programs, <em>git mergetool</em> can be customized to run an alternative program by specifying the command line to invoke in a configuration -variable <tt>mergetool.<tool>.cmd</tt>.</p></div> +variable <code>mergetool.<tool>.cmd</code>.</p></div> <div class="paragraph"><p>When <em>git mergetool</em> is invoked with this tool (either through the -<tt>-t</tt> or <tt>--tool</tt> option or the <tt>merge.tool</tt> configuration -variable) the configured command line will be invoked with <tt>$BASE</tt> +<code>-t</code> or <code>--tool</code> option or the <code>merge.tool</code> configuration +variable) the configured command line will be invoked with <code>$BASE</code> set to the name of a temporary file containing the common base for -the merge, if available; <tt>$LOCAL</tt> set to the name of a temporary +the merge, if available; <code>$LOCAL</code> set to the name of a temporary file containing the contents of the file on the current branch; -<tt>$REMOTE</tt> set to the name of a temporary file containing the -contents of the file to be merged, and <tt>$MERGED</tt> set to the name +<code>$REMOTE</code> set to the name of a temporary file containing the +contents of the file to be merged, and <code>$MERGED</code> set to the name of the file to which the merge tool should write the result of the merge resolution.</p></div> <div class="paragraph"><p>If the custom merge tool correctly indicates the success of a merge resolution with its exit code, then the configuration -variable <tt>mergetool.<tool>.trustExitCode</tt> can be set to <tt>true</tt>. +variable <code>mergetool.<tool>.trustExitCode</code> can be set to <code>true</code>. Otherwise, <em>git mergetool</em> will prompt the user to indicate the success of the resolution after the custom tool has exited.</p></div> </dd> @@ -818,7 +816,7 @@ </dt> <dd> <p> - Print a list of merge tools that may be used with <tt>--tool</tt>. + Print a list of merge tools that may be used with <code>--tool</code>. </p> </dd> <dt class="hdlist1"> @@ -832,8 +830,8 @@ Don’t prompt before each invocation of the merge resolution program. This is the default if the merge resolution program is - explicitly specified with the <tt>--tool</tt> option or with the - <tt>merge.tool</tt> configuration variable. + explicitly specified with the <code>--tool</code> option or with the + <code>merge.tool</code> configuration variable. </p> </dd> <dt class="hdlist1"> @@ -851,11 +849,11 @@ <div class="sect1"> <h2 id="_temporary_files">TEMPORARY FILES</h2> <div class="sectionbody"> -<div class="paragraph"><p><tt>git mergetool</tt> creates <tt>*.orig</tt> backup files while resolving merges. +<div class="paragraph"><p><code>git mergetool</code> creates <code>*.orig</code> backup files while resolving merges. These are safe to remove once a file has been merged and its -<tt>git mergetool</tt> session has completed.</p></div> -<div class="paragraph"><p>Setting the <tt>mergetool.keepBackup</tt> configuration variable to <tt>false</tt> -causes <tt>git mergetool</tt> to automatically remove the backup as files +<code>git mergetool</code> session has completed.</p></div> +<div class="paragraph"><p>Setting the <code>mergetool.keepBackup</code> configuration variable to <code>false</code> +causes <code>git mergetool</code> to automatically remove the backup as files are successfully merged.</p></div> </div> </div> 